Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Apr 2011 04:52:22 +0000 (21:52 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Apr 2011 04:52:22 +0000 (21:52 -0700)
commitce46294afc9f74a7ba71d066bb76363fd334a535
treea53a8ba7f5fc4f240d4e3baeca4c18f568787a8e
parent6c6fb5bbad28747f71d7094fbc212c625e19b595
parentc1c66d7244dbc55e5d6548af448e5efedf5f35d2
Merge from mainline.
ChangeLog